From 592b33cb48fabb02d416814e3b476cb03c37e98b Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 3 Feb 2021 14:05:27 +0000 Subject: [PATCH] Graphene is a dependency of Gsk, not Gdk So let's put it in the right place when building the introspection data. --- gtk/meson.build | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gtk/meson.build b/gtk/meson.build index c1b2186e89..42cb07a205 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1142,12 +1142,6 @@ if build_gir # the installed one gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', ] - if graphene_dep.type_name() == 'internal' - gdk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) - else - gdk_gir_inc += 'Graphene-1.0' - endif - if pixbuf_dep.type_name() == 'internal' gdk_gir_inc += subproject('gdk-pixbuf').get_variable('gdkpixbuf_gir').get(0) else @@ -1211,6 +1205,12 @@ if build_gir gsk_gir_inc = [ gdk_gir[0] ] + if graphene_dep.type_name() == 'internal' + gsk_gir_inc += subproject('graphene').get_variable('graphene_gir').get(0) + else + gsk_gir_inc += 'Graphene-1.0' + endif + gsk_gir = gnome.generate_gir(libgtk, sources: gsk_public_headers + gsk_public_sources + [ gskenum_h ], namespace: 'Gsk', -- 2.30.2